merge trunk

diff --cc etc/ChangeLog
index c4a1e57ebb690b77821abe85420b2d1f06739598,071e5e11a182daa587709d19d1de761b6066cbbe..fb0ebb9838b6bd48c3225096431844e6f26c2a7a
--- 1/etc/ChangeLog
--- 2/etc/ChangeLog
+++ b/etc/ChangeLog
@@@ -1,7 -1,8 +1,12 @@@
 +2012-10-14  Kenichi Handa  <handa@gnu.org>
 +
 +      * charsets/JISC6226.map: Re-generated.
 +
+ 2012-10-14  Eli Zaretskii  <eliz@gnu.org>
+ 
+       * compilation.txt (msft): Add error messages in new Studio 2010
+       format.
+ 
  2012-10-11  Kenichi Handa  <handa@gnu.org>
  
        * charsets/CNS-2.map, charsets/CNS-3.map, charsets/CNS-4.map,